Fix coroutine MIR saved local remapping#158655
Merged
Merged
Conversation
Collaborator
|
Some changes occurred to MIR optimizations cc @rust-lang/wg-mir-opt |
rustbot
added
S-waiting-on-review
Collaborator
|
r? @TaKO8Ki rustbot has assigned @TaKO8Ki. Use Why was this reviewer chosen?The reviewer was selected based on:
|
Contributor
Author
|
r? cjgillot who probably has more context |
cjgillot
reviewed
Jul 1, 2026
cjgillot
added
S-waiting-on-author
dingxiangfei2009
force-pushed
the
fix-remapping
branch
from
f809a69 to
fd23727
Compare
Contributor
Author
|
@rustbot ready |
rustbot
added
S-waiting-on-review
cjgillot
reviewed
Jul 3, 2026
Signed-off-by: Xiangfei Ding <dingxiangfei2009@protonmail.ch>
dingxiangfei2009
force-pushed
the
fix-remapping
branch
from
fd23727 to
aa485b2
Compare
Collaborator
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
This comment has been minimized.
This comment has been minimized.
dingxiangfei2009
force-pushed
the
fix-remapping
branch
from
aa485b2 to
bb63725
Compare
This comment has been minimized.
This comment has been minimized.
dingxiangfei2009
force-pushed
the
fix-remapping
branch
from
bb63725 to
81a734f
Compare
Storage is still required even if the local is moved out and immediately moved in again. Signed-off-by: Xiangfei Ding <dingxiangfei2009@protonmail.ch>
dingxiangfei2009
force-pushed
the
fix-remapping
branch
from
81a734f to
401dc21
Compare
Contributor
Author
|
@rustbot ready |
Contributor
Author
|
@cjgillot Thank you for your review! I have applied the suggestions. Let me know any other outstanding concerns. Cheers! |
Contributor
|
Great ! |
Contributor
Author
|
@bors try jobs=aarch64-gnu-debug |
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 11, 2026
Fix coroutine MIR saved local remapping try-job: aarch64-gnu-debug
Contributor
Contributor
Author
|
@jhpratt Okay it looks like the previous failure was due to another PR in the rollup. Shall we proceed? |
Contributor
|
@bors r+ |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Fix coroutine MIR saved local remapping The unsound analysis was found while I was working on the `async-drop` code. Apparently the counter variable in the array drop glue is not correctly identified as a saved local. Also we did not patch up indices in `ProjectionElem::Index` when they are saved locals. The reproduction is in the older commit with the expected output.
rust-bors
Bot
added
S-waiting-on-review
Contributor
|
💔 Test for 71a41fd failed: CI. Failed job:
|
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
Author
|
Hmm spicy segv... I will look into this |
Contributor
Author
|
@bors try jobs=dist-android |
This comment has been minimized.
This comment has been minimized.
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Fix coroutine MIR saved local remapping try-job: dist-android
Contributor
Contributor
Author
|
@bors r+ I think CI experienced some memory pressure. |
Contributor
rust-bors
Bot
added
S-waiting-on-bors
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Rollup of 11 pull requests Successful merges: - #159210 (`rust-analyzer` subtree update) - #158655 (Fix coroutine MIR saved local remapping) - #159205 (bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered`) - #159208 (Fix `attr_on_non_tail_expr` typo) - #157524 (Fix relative paths in private import suggestions) - #158325 (Document NonNull layout guarantees) - #158882 (enable `do_not_recommend` attr for method call errors in current solver) - #158982 (Pretty-print MIR user types too.) - #159069 (Add codegen test for constant returns after local use) - #159163 (rustc_target: Add acquire-release to implied features of v8) - #159201 (borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>`)
rust-bors Bot
pushed a commit
that referenced
this pull request
Jul 13, 2026
Rollup of 11 pull requests Successful merges: - #159210 (`rust-analyzer` subtree update) - #158655 (Fix coroutine MIR saved local remapping) - #159205 (bootstrap: Replace `ShouldRun::crates` with `crate_or_deps_filtered`) - #159208 (Fix `attr_on_non_tail_expr` typo) - #157524 (Fix relative paths in private import suggestions) - #158325 (Document NonNull layout guarantees) - #158882 (enable `do_not_recommend` attr for method call errors in current solver) - #158982 (Pretty-print MIR user types too.) - #159069 (Add codegen test for constant returns after local use) - #159163 (rustc_target: Add acquire-release to implied features of v8) - #159201 (borrowck: Represent 'best blame constraint' as index into `Vec<OutlivesConstraint>`)
rust-timer
added a commit
that referenced
this pull request
Jul 13, 2026
Rollup merge of #158655 - dingxiangfei2009:fix-remapping, r=dingxiangfei2009 Fix coroutine MIR saved local remapping The unsound analysis was found while I was working on the `async-drop` code. Apparently the counter variable in the array drop glue is not correctly identified as a saved local. Also we did not patch up indices in `ProjectionElem::Index` when they are saved locals. The reproduction is in the older commit with the expected output.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
View all comments
The unsound analysis was found while I was working on the
async-dropcode. Apparently the counter variable in the array drop glue is not correctly identified as a saved local.Also we did not patch up indices in
ProjectionElem::Indexwhen they are saved locals.The reproduction is in the older commit with the expected output.